Merge from origin/emacs-25

f5d6b9b Revert "Support integer image rotation and respect EXIF rotations"
afe7d1f Revert "Document EXIF image rotation"
c6f377c Document OS X LANG default
eb4a18c Set locale when run from OS X GUI
456c0a3 make-docfile cleanup for I/O, etc.
25ec995 Memory-management cleanup in make-docfile
02d925e Kevin Gallagher has new email address
4ef153b Improve doc strings of 'forward/backward-word-strictly'
3ad05a0 Describe Makefile test targets in test/README

diff --cc Makefile.in
Simple merge

diff --cc doc/lispref/display.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/syntax.c
Simple merge